Fix network setup through hotplug on SUSE.

Move the hotplug script from /etc/hotplug.d/xen-backend/backend.hotplug
to /etc/hotplug/xen-backend.agent, which seems to be a more common place
for the script.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
--HG--
rename : tools/examples/backend.hotplug => tools/examples/xen-backend.agent

diff --git a/Makefile b/Makefile
index 7a6773b1c2cddcbea3eae9ed9f2031aa91113e92..3b50ec6436790ea3b0299079aeb23cc09931940a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -178,6 +178,8 @@ uninstall:
        rm -rf $(D)/usr/share/man/man1/xen*
        rm -rf $(D)/usr/share/man/man8/xen*
        rm -rf $(D)/usr/lib/xen
+       rm -rf $(D)/etc/hotplug.d/xen-backend
+       rm -rf $(D)/etc/hotplug/xen-backend.agent
 
 # Legacy targets for compatibility
 linux24:

diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index c196978f85349bcb76e9b5e924cdbc2d08e9af0e..c4cbf8ed94edbd2c1d9ce63dcb2a066f509e154b 100644 (file)
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -27,8 +27,8 @@ XEN_SCRIPTS += block-enbd
 XEN_BOOT_DIR = /usr/lib/xen/boot
 XEN_BOOT = mem-map.sxp
 
-XEN_HOTPLUG_DIR = /etc/hotplug.d/xen-backend
-XEN_HOTPLUG_SCRIPTS = backend.hotplug
+XEN_HOTPLUG_DIR = /etc/hotplug
+XEN_HOTPLUG_SCRIPTS = xen-backend.agent
 
 all: 
 build:

diff --git a/tools/examples/backend.hotplug b/tools/examples/backend.hotplug
deleted file mode 100755 (executable)
index a708aad..0000000
--- a/tools/examples/backend.hotplug
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-#DEVPATH=/devices/xen-backend/vif-1-0
-#ACTION=add
-
-PATH=/etc/xen/scripts:$PATH
-
-DEV=$(basename "$DEVPATH")
-case "$ACTION" in
-  add)
-    case "$DEV" in
-      vif-*)
-        vif=$(echo "$DEV" | sed 's/-\([0-9]*\)-\([0-9]*\)/\1.\2/')
-        vif-bridge up domain=unknown vif="$vif" mac=fe:ff:ff:ff:ff:ff bridge=xen-br0 >/dev/null 2>&1
-        ;;
-    esac
-    ;;
-  remove)
-    ;;
-esac
-

diff --git a/tools/examples/xen-backend.agent b/tools/examples/xen-backend.agent
new file mode 100755 (executable)
index 0000000..a708aad
--- /dev/null
+++ b/tools/examples/xen-backend.agent
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+#DEVPATH=/devices/xen-backend/vif-1-0
+#ACTION=add
+
+PATH=/etc/xen/scripts:$PATH
+
+DEV=$(basename "$DEVPATH")
+case "$ACTION" in
+  add)
+    case "$DEV" in
+      vif-*)
+        vif=$(echo "$DEV" | sed 's/-\([0-9]*\)-\([0-9]*\)/\1.\2/')
+        vif-bridge up domain=unknown vif="$vif" mac=fe:ff:ff:ff:ff:ff bridge=xen-br0 >/dev/null 2>&1
+        ;;
+    esac
+    ;;
+  remove)
+    ;;
+esac
+